Revision: bazaar--devel--1.4--patch-17
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Mon Apr 25 07:53:31 EST 2005
Standard-date: 2005-04-24 21:53:31 GMT
Modified-files: baz/baz.c commands/add-id.c
    commands/cmdutils.c commands/register-archive.c
    commands/resolved.c commands/status.c
    libarch/conflict-handling.c libarch/pfs-dav.c
    tests/test-add.sh
New-patches: Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-4
    jblack@gnuarch.org--2005/baz--authentication--1.3--patch-14
    jblack@gnuarch.org--2005/baz--authentication--1.3--patch-15
    jblack@gnuarch.org--2005/baz--authentication--1.3--patch-16
    jblack@gnuarch.org--2005/baz--authentication--1.3--patch-17
    jblack@gnuarch.org--2005/baz--resolved--1.4--base-0
    jblack@gnuarch.org--2005/baz--resolved--1.4--patch-1
    jblack@gnuarch.org--2005/baz--resolved--1.4--patch-2
    rob.weir@canonical.com--2005-public/baz--baznotarch--0--base-0
    rob.weir@canonical.com--2005-public/baz--baznotarch--0--patch-1
    rob.weir@canonical.com--2005-public/baz--bug305041--0--base-0
    rob.weir@canonical.com--2005-public/baz--bug305041--0--patch-1
    rob.weir@canonical.com--2005-public/baz--bug315--0--base-0
    rob.weir@canonical.com--2005-public/baz--bug315--0--patch-1
    rob.weir@canonical.com--2005-public/baz--bug342b--0--base-0
    rob.weir@canonical.com--2005-public/baz--bug342b--0--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-67
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-17
    thelove@canonical.com/bazaar--devo--1.3--patch-75
    thelove@canonical.com/bazaar--devo--1.3--patch-76
    thelove@canonical.com/bazaar--devo--1.4--patch-16
    thelove@canonical.com/bazaar--devo--1.4--patch-17
    thelove@canonical.com/bazaar--devo--1.4--patch-18
    thelove@canonical.com/bazaar--devo--1.4--patch-19
    thelove@canonical.com/bazaar--devo--1.4--patch-20
    thelove@canonical.com/bazaar--devo--1.4--patch-21
    thelove@canonical.com/bazaar--devo--1.4--patch-22
    thelove@canonical.com/bazaar--devo--1.4--patch-23
    thelove@canonical.com/bazaar--devo--1.4--patch-24
    thelove@canonical.com/bazaar--devo--1.4--patch-25
Removed-patches: jblack@gnuarch.org--2005/baz--sftpauto--1.4--base-0
    jblack@gnuarch.org--2005/baz--sftpauto--1.4--patch-1
    jblack@gnuarch.org--2005/baz--sftpauto--1.4--patch-2
    jblack@gnuarch.org--2005/baz--sftpauto--1.4--patch-3
Summary: merge from dalove
Keywords: 

Patches applied:

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-1
   bugfix: Initialize answer->proxy_auth after mem_set0 in pfs-dav.c

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-4
   Avoid panic in arch_cmd_status()

 * jblack@gnuarch.org--2005/baz--authentication--1.3--patch-14
   merge from upstream

 * jblack@gnuarch.org--2005/baz--authentication--1.3--patch-15
   Sometimes status lied about conflicts (fix from Matthieu Moy)

 * jblack@gnuarch.org--2005/baz--authentication--1.3--patch-16
   Merging from upstream (again)

 * jblack@gnuarch.org--2005/baz--authentication--1.3--patch-17
   memset0 before setting a variable, not after (Moy)

 * jblack@gnuarch.org--2005/baz--resolved--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-24

 * jblack@gnuarch.org--2005/baz--resolved--1.4--patch-1
   Fixing resolved so it actually resolves (user input tricked it in all but the most trivial cases

 * jblack@gnuarch.org--2005/baz--resolved--1.4--patch-2
   fixing resolved help

 * rob.weir@canonical.com--2005-public/baz--baznotarch--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-19

 * rob.weir@canonical.com--2005-public/baz--baznotarch--0--patch-1
   s/arch/baz/ in baz -h output.

 * rob.weir@canonical.com--2005-public/baz--bug305041--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-19

 * rob.weir@canonical.com--2005-public/baz--bug305041--0--patch-1
   Get rid of the new line from add --version's help.

 * rob.weir@canonical.com--2005-public/baz--bug315--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-16

 * rob.weir@canonical.com--2005-public/baz--bug315--0--patch-1
   Fix segfault when trying to switch to branches in unregistered archives.

 * rob.weir@canonical.com--2005-public/baz--bug342b--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-18

 * rob.weir@canonical.com--2005-public/baz--bug342b--0--patch-1
   Make register-archive help text clearer about use of the name parameter.

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-67
   merge in update correctness. ancestry aggresiveness reduction, and get scan reduction

 * thelove@canonical.com/bazaar--devo--1.3--patch-75
   merge in update correctness. ancestry aggresiveness reduction, and get scan reduction

 * thelove@canonical.com/bazaar--devo--1.3--patch-76
   bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.

 * thelove@canonical.com/bazaar--devo--1.4--patch-16
   merge in inode-sigs hide permission changes bugfix from tla 1.3.2

 * thelove@canonical.com/bazaar--devo--1.4--patch-17
   Fix segfault when trying to switch to branches in unregistered archives.

 * thelove@canonical.com/bazaar--devo--1.4--patch-18
   bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.

 * thelove@canonical.com/bazaar--devo--1.4--patch-19
   Make register-archive help text clearer about use of the name parameter.

 * thelove@canonical.com/bazaar--devo--1.4--patch-20
   bugfix apply-changeset to detect conflicting double-adds of ids

 * thelove@canonical.com/bazaar--devo--1.4--patch-21
   Get rid of the new line from add --version's help.

 * thelove@canonical.com/bazaar--devo--1.4--patch-22
   s/arch/baz/ in baz -h output.

 * thelove@canonical.com/bazaar--devo--1.4--patch-23
   status sometimes lied about conflicts (Mattheiu Moy)

 * thelove@canonical.com/bazaar--devo--1.4--patch-24
   pfs-dav, memset0 before you set the variable (Moy)

 * thelove@canonical.com/bazaar--devo--1.4--patch-25
   Fix for resolved. The command was tricked by all but the simplest user input. Fix resolved help. Took errant echo out of add test case

